From df8be26e87af6e69611319218b9f454fa1d4ddde Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Thu, 28 Oct 2021 15:45:49 +0100 Subject: [PATCH] libcxxabi-fix-link-builtins if LIBCXXABI_USE_COMPILER_RT=ON, add builtins to libcxxabi library flags, otherwise add libgcc following how libunwind does the same Gbp-Pq: Name libcxxabi-fix-link-builtins.diff --- libcxxabi/src/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt index a8e12aa36e..9b160e0913 100644 --- a/libcxxabi/src/CMakeLists.txt +++ b/libcxxabi/src/CMakeLists.txt @@ -104,7 +104,9 @@ if (ANDROID AND ANDROID_PLATFORM_LEVEL LESS 21) list(APPEND LIBCXXABI_LIBRARIES android_support) endif() -if (NOT LIBCXXABI_USE_COMPILER_RT) +if (LIBCXXABI_USE_COMPILER_RT) + add_library_flags("${LIBCXXABI_BUILTINS_LIBRARY}") +else() add_library_flags_if(LIBCXXABI_HAS_GCC_LIB gcc) endif () -- 2.30.2